Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 13:12:41 +0000 (13:12 +0000)
committerSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 13:12:41 +0000 (13:12 +0000)
commite812bdf5c4e85ce6fa5ebd1c18dd1d2d0f4d5d6c
treed70f11d288cb07be7958c8898766e175c18a54d8
parent7be5d5173c9e7065f37fd430876490911ff448e7
parent4ffdeb2ddc7270a935ed838daa72fc77ec18c3d1
Merge.